Small cleanup to parallel CD