Review fixes
Review fixes: Removing migration code