api,daemon: cleanup some unused stuff Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2 Component: engine