Improved deftemplate behaviour, added remove-template