DATACOUCH-96 - After release cleanups.