Cleaning up node templates