Removed the per client state idea - it was ridiculous