remove old view code

change some TODOs to CLEANUP