Working to clean up node, etc.