removed redundant templates