cleaning up some views