#753 - Remove migration hacks