cleans up some imports

the bigger thing here is that SingleClientConnManager is deprecated