Clean up a bunch of server socket handler code
Fix double drop event bug
One more server socket handler cleanup