Fix migrations.

Delete old tables.

Also fix minor errors in previous migrations. Especially with
contenttypes not being updated correctly.

Change-Id: I7988615792e65cc2659933ff392229df69ce83fa