Remove nodestack references