Removed extraneous changes and fix the migration