Removed client associations and replaced with client sessions