Cleaned up some views after removing CMS