Fix removeNewNodeListener not properly removing listener