close is deprecated a while ago. Could you remove all close calls in your code?
In the long run, I think it's better to change the API similar to RemoteManager.