removed unused stuff, mainly from view