remove unneeded refs
remove dispatcher form ClientServer