Removed redundant templates