DATAES-87 - post release cleanups.