DATAREST-350 - After release cleanups.