Removed factory storage usage