Fix error, remove obsolete classes and NMS access