Removed some templates