clean multi-server support 

It should be good this time :-)