Bugfixes

oops: Don't remove node from list while deleting, is already taken
      care of in the caller function