DATACMNS-608 - After release cleanups.