added the ability to remove objects and templates