Removing unneeded template