Remove some left-over templates