Clean up some views