SYN-48: Delete dead code
Update docstring
Unbreak tests after changing storage API