[IMP] Clean out code: remove master_source/dest_location_id, problem with required