Cleaning up some older views