unused in master branch
some simplification of the server code