put clean output back
cleaned up cloud_service  - keeping while refactoring completes