Reorganize Storage.remove_client