remove migration problem hacks