more fixing of migrations, removing old ones that have reappeared whilst keeping new ones and replacing missing ones