Removing more templates