DATAGRAPH-504 - After release cleanups.