SERVER-9038 cleanup of unused code and variable renaming