Get rid of templates we don't need - moved these changes to trunk