Clean up commented template code