Code

Fixed removal of template entries