Cleaned up some legacy junk in views