Support removal of templates as well