DATAREST-401 - After release cleanups.