Refactor. No more market server.