I think the larger issue is that we need a better way to store and delete files connected to entities. I don't think this is a show stopper for this PR.