SERVER-10026 more dead code deletion