Removed unused templates