Deleted AbstractNodeAware since unused