Fixes for dox + Deprecate edb.Service.