DATAGRAPH-501 - After release cleanups.