cleaned up Cloud Management