removed unneeded migration
cleaned up migrations
fixed up ControllerMacro issues