Chore tidy up schema and db

Tidies up some weirdness with `schema.rb` and moves pending cleanup migrations to the migration folder, ready to be run.