Additional fix to purge client maps along with client data