Remove now-unnecessary wrappers around storage operations