Remove obsolete methods from Storage

Change-Id: I59d0390ad9de7f70c9db09eca94503bdb6e92438
Merge "Remove obsolete methods from Storage"