begin deskcon-server cleaup, reindent, simplify stats transfer