Refactored structure; Clean up; removeNode with promise