cleaned up templates entirely