Cloud unification: removing credentials (only for clouds) support