Revert "Make TemplateRemoveer *actually* remove templates"

This reverts commit e0c23a6038411b2295dd83bf7021ae2c3534f523.

mark found a way that was not as agricultural
Make template removal work properly