SERVER-6405: remove dead code and move things around