Remove all unused imports from CB, remove unused CB imports from NMS
Fix LF line endings.