Will remove all cloudfuji code in one PR later