DATACOUCH-95 - After release cleanups.