Clean up the old multiserver implement