Fix the fix for removing nodes by splitting NodeRemoved into ResourceNodeRemoved and BlankNodeRemoved events