Finish migrating
Remove bundle hack