removed NodeTracker hack
cleanup