Added explicit get_destination_units for the unit import conduit (along
with a ton of clean up things)