Cleanup, got rid of unnecessary views and models