Remove some currently unused elements from templates