removed a bunch of stuff
removed more junk
Merge branch '1069_template_cleanup' into develop