Clean up templates by removing unused buttons