Removed more templates