Remove CloudEngine abstraction