test server/client scheme
Remove lots of unused code.