Remove even more C2 dependency

Yay NMS!