Fixes #80 - Remove App.socket and SocketFactory.find