Merge pull request #203 from lavalamp/api

cloundcfg api improvements
First step of combination.
Use new method.
catch 202 early
Remove dead code