some cleanup
remove dead code
echo server