some cleanup of the storage 404 handling