Remove dependency on most