Templatebuilder build file, controller cleanup