Removed a bunch of old views that were not necessary