Removed dependencies on the Node class.