Clean up templates further