SERVER-85. Cleanup