SERVER-13084 migrate builder to new iface, some clean-up