Also removes controller which is a deprecated pattern * some comment improvements * remove uneeded code