Remove some migrations and adjust things to new app names