DATACOUCH-84 - After release cleanups.