DATACOUCH-116 - After release cleanups.