Remove migration hacks