6b846b9709
* Remove global service declarations and change to declarations upon usage. * Only load cava service if cava is enabled.