Template clean up

Template clean up