Removing Nodefly pt. 2