squash me - base: add remove_client to rm_session