Nearly finished moving away from the large Cargo dependency