Removed storageHandler method