Removing redundant template