clean multi-server support