fix incomplete refactoring, cleaning up tenant APIs and
make sure everything that needs to be started is started.