Removed unnecessary views.
Some more stuff