deleted unnecessary crap and old comments from controller