DATACOUCH-99 - After release cleanups.