Removing extra accept node calls