Cleanup code
	modified:   Makefile
	modified:   eventserver.cpp