DATAMONGO-835 - Code cleanups.