NX-485: clean up last non-client-facing split packages