diff --git a/beat/web/algorithms/migrations/0002_auto_20160630_1644.py b/beat/web/algorithms/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index b2922b3c15d0afdff73698f2783fa7c81dd860e8..0000000000000000000000000000000000000000
--- a/beat/web/algorithms/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('algorithms', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='algorithm',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
-        ),
-    ]
diff --git a/beat/web/algorithms/migrations/0003_auto_20160701_1707.py b/beat/web/algorithms/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 36700aa4e0a1bfb6817cfcab3a9620cba1f23ac9..0000000000000000000000000000000000000000
--- a/beat/web/algorithms/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('algorithms', '0002_auto_20160630_1644'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='algorithm',
-            options={'ordering': ['version', 'id']},
-        ),
-    ]
diff --git a/beat/web/algorithms/migrations/0004_auto_20160704_1109.py b/beat/web/algorithms/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index c1ba409b4da74b22080d8bb2991845116068f10a..0000000000000000000000000000000000000000
--- a/beat/web/algorithms/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('algorithms', '0003_auto_20160701_1707'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='algorithm',
-            options={'ordering': ['author__username', 'name', 'version']},
-        ),
-    ]
diff --git a/beat/web/databases/migrations/0003_auto_20160630_1710.py b/beat/web/databases/migrations/0003_auto_20160630_1710.py
deleted file mode 100644
index 9ba33dccc92e3121332148dfddb20d2aabd8d523..0000000000000000000000000000000000000000
--- a/beat/web/databases/migrations/0003_auto_20160630_1710.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 17:10
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('databases', '0002_scheduler_addons'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='database',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
-        ),
-    ]
diff --git a/beat/web/databases/migrations/0005_auto_20160704_1109.py b/beat/web/databases/migrations/0003_auto_20160704_1316.py
similarity index 76%
rename from beat/web/databases/migrations/0005_auto_20160704_1109.py
rename to beat/web/databases/migrations/0003_auto_20160704_1316.py
index 08830e32711fe17c395e293e764081ad20bb10ae..575732e942c2085e146b3697b3c75e0c1ff578b5 100644
--- a/beat/web/databases/migrations/0005_auto_20160704_1109.py
+++ b/beat/web/databases/migrations/0003_auto_20160704_1316.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
+# Generated by Django 1.9.4 on 2016-07-04 13:16
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('databases', '0004_auto_20160701_1707'),
+        ('databases', '0002_scheduler_addons'),
     ]
 
     operations = [
diff --git a/beat/web/databases/migrations/0004_auto_20160701_1707.py b/beat/web/databases/migrations/0004_auto_20160701_1707.py
deleted file mode 100644
index f56c20d59654ea7d76e5a2e5b474a82b6f071e3d..0000000000000000000000000000000000000000
--- a/beat/web/databases/migrations/0004_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('databases', '0003_auto_20160630_1710'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='database',
-            options={'ordering': ['version', 'id']},
-        ),
-    ]
diff --git a/beat/web/dataformats/migrations/0002_auto_20160701_1712.py b/beat/web/dataformats/migrations/0002_auto_20160704_1319.py
similarity index 70%
rename from beat/web/dataformats/migrations/0002_auto_20160701_1712.py
rename to beat/web/dataformats/migrations/0002_auto_20160704_1319.py
index 6bfb8fe68b89d7386ebeba414136a932d5b8732f..c950a9e8f2e4a077c7da3540d0566ca7b2575a79 100644
--- a/beat/web/dataformats/migrations/0002_auto_20160701_1712.py
+++ b/beat/web/dataformats/migrations/0002_auto_20160704_1319.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:12
+# Generated by Django 1.9.4 on 2016-07-04 13:19
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='dataformat',
-            options={'ordering': ['version', 'id'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
+            options={'ordering': ['author__username', 'name', 'version'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
         ),
         migrations.AlterUniqueTogether(
             name='dataformat',
diff --git a/beat/web/dataformats/migrations/0003_auto_20160704_1109.py b/beat/web/dataformats/migrations/0003_auto_20160704_1109.py
deleted file mode 100644
index b434ca0369990313e44d93dbed20d4806d821998..0000000000000000000000000000000000000000
--- a/beat/web/dataformats/migrations/0003_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dataformats', '0002_auto_20160701_1712'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='dataformat',
-            options={'ordering': ['author__username', 'name', 'version'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
-        ),
-    ]
diff --git a/beat/web/experiments/migrations/0006_auto_20160630_1644.py b/beat/web/experiments/migrations/0006_auto_20160630_1644.py
deleted file mode 100644
index 6a5e22b5dc9595f74225811af07fc589f48acc76..0000000000000000000000000000000000000000
--- a/beat/web/experiments/migrations/0006_auto_20160630_1644.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-###############################################################################
-#                                                                             #
-# Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/           #
-# Contact: beat.support@idiap.ch                                              #
-#                                                                             #
-# This file is part of the beat.web module of the BEAT platform.              #
-#                                                                             #
-# Commercial License Usage                                                    #
-# Licensees holding valid commercial BEAT licenses may use this file in       #
-# accordance with the terms contained in a written agreement between you      #
-# and Idiap. For further information contact tto@idiap.ch                     #
-#                                                                             #
-# Alternatively, this file may be used under the terms of the GNU Affero      #
-# Public License version 3 as published by the Free Software and appearing    #
-# in the file LICENSE.AGPL included in the packaging of this file.            #
-# The BEAT platform is distributed in the hope that it will be useful, but    #
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
-# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
-#                                                                             #
-# You should have received a copy of the GNU Affero Public License along      #
-# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
-#                                                                             #
-###############################################################################
-
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('experiments', '0005_scheduler_addons_4'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='block',
-            options={'ordering': ['id']},
-        ),
-    ]
diff --git a/beat/web/experiments/migrations/0007_auto_20160701_0909.py b/beat/web/experiments/migrations/0006_block_order.py
similarity index 98%
rename from beat/web/experiments/migrations/0007_auto_20160701_0909.py
rename to beat/web/experiments/migrations/0006_block_order.py
index 7ccca4467a7887803dc97a7cbbce5e484bdd5533..4f83b5d17c60367a19c3cca876549e8a629cebe9 100644
--- a/beat/web/experiments/migrations/0007_auto_20160701_0909.py
+++ b/beat/web/experiments/migrations/0006_block_order.py
@@ -80,7 +80,7 @@ def set_block_order(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('experiments', '0006_auto_20160630_1644'),
+        ('experiments', '0005_scheduler_addons_4'),
     ]
 
     operations = [
diff --git a/beat/web/libraries/migrations/0002_auto_20160630_1644.py b/beat/web/libraries/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index 50dd6910c64d55220058c966c9454da993388bd7..0000000000000000000000000000000000000000
--- a/beat/web/libraries/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('libraries', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='library',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id'], 'verbose_name_plural': 'libraries'},
-        ),
-    ]
diff --git a/beat/web/libraries/migrations/0003_auto_20160701_1707.py b/beat/web/libraries/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 2e8dafe92ab7fcdf8910f726facea6350b5a0a5c..0000000000000000000000000000000000000000
--- a/beat/web/libraries/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('libraries', '0002_auto_20160630_1644'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='library',
-            options={'ordering': ['version', 'id'], 'verbose_name_plural': 'libraries'},
-        ),
-    ]
diff --git a/beat/web/libraries/migrations/0004_auto_20160704_1109.py b/beat/web/libraries/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index 6d541b08d88a4816f1e15d9ebce2130c1a423791..0000000000000000000000000000000000000000
--- a/beat/web/libraries/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('libraries', '0003_auto_20160701_1707'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='library',
-            options={'ordering': ['author__username', 'name', 'version'], 'verbose_name_plural': 'libraries'},
-        ),
-    ]
diff --git a/beat/web/plotters/migrations/0002_auto_20160630_1644.py b/beat/web/plotters/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index 97cac19ceed54a925ab53d8262f16cd60f3934ce..0000000000000000000000000000000000000000
--- a/beat/web/plotters/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('plotters', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='plotter',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
-        ),
-        migrations.AlterModelOptions(
-            name='plotterparameter',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
-        ),
-    ]
diff --git a/beat/web/plotters/migrations/0003_auto_20160701_1707.py b/beat/web/plotters/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index cd1e2c23695839a9c42466a5a927f8fa2c17740e..0000000000000000000000000000000000000000
--- a/beat/web/plotters/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('plotters', '0002_auto_20160630_1644'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='plotter',
-            options={'ordering': ['version', 'id']},
-        ),
-        migrations.AlterModelOptions(
-            name='plotterparameter',
-            options={'ordering': ['version', 'id']},
-        ),
-    ]
diff --git a/beat/web/plotters/migrations/0004_auto_20160704_1109.py b/beat/web/plotters/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index e7de401066190647f2e4a9da1431cfbf4141061c..0000000000000000000000000000000000000000
--- a/beat/web/plotters/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('plotters', '0003_auto_20160701_1707'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='plotter',
-            options={'ordering': ['author__username', 'name', 'version']},
-        ),
-        migrations.AlterModelOptions(
-            name='plotterparameter',
-            options={'ordering': ['author__username', 'name', 'version']},
-        ),
-    ]
diff --git a/beat/web/toolchains/migrations/0002_auto_20160630_1644.py b/beat/web/toolchains/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index ce1b4cb983838337fe13de8c9bfbb90fdd74088a..0000000000000000000000000000000000000000
--- a/beat/web/toolchains/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('toolchains', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='toolchain',
-            options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
-        ),
-    ]
diff --git a/beat/web/toolchains/migrations/0003_auto_20160701_1707.py b/beat/web/toolchains/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 321e2836022a77f0a0e7d60c3589fab92fb201f4..0000000000000000000000000000000000000000
--- a/beat/web/toolchains/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('toolchains', '0002_auto_20160630_1644'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='toolchain',
-            options={'ordering': ['version', 'id']},
-        ),
-    ]
diff --git a/beat/web/toolchains/migrations/0004_auto_20160704_1109.py b/beat/web/toolchains/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index 555d2d6dc9e6d2ab96adfcbcf7a7380e6e67c2ad..0000000000000000000000000000000000000000
--- a/beat/web/toolchains/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('toolchains', '0003_auto_20160701_1707'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='toolchain',
-            options={'ordering': ['author__username', 'name', 'version']},
-        ),
-    ]