DATACOUCH-107 - After release cleanups.