Removed storage.has and fixed storage.forEach