Cleaning up views some