If this has been incorrect since we've been using manifest objects, do we need to add some code to do cleanup of objects incorrectly marked as shadows?