Template clean up round 2