Basic clean up for starters

It does the basic clean up
You should not have had to change the schema file since there are no migrations to run. Please revert this file.