I agree 100%. I believe we will be able to get rid of it with some more refactoring and separation of the Server and PeerServer's responsibilities.