Fix migration bugs and remove spam