Remove some more old template remnants.