Fixed migrations, cleaned unnecessary views