Cleaned up migration associations and ebr files to match forms and user info