refactor/simplify detection of api server capability and remove statemanager

[gtully]

the logic around detecting the api server is split across multiple calls and places, a little refactor will help.