Code cleanup

clean dserv
clean web server
add testing