DATACOUCH-106 - After release cleanups.