Clean stuff

Nothing interesting in this commit. Many changes from test server,
don't know what to write :-)