Clean up more templates