Templates cleaned up