Cleaning up views
more cleaning