disable client storage before it will be refactored
...