Remove trailing whitespace.
Remove all unused imports from CB, remove unused CB imports from NMS