clean up template (JBIDE-13452) >> master