Remove dependency on foreign unit