storage: some cleanups