States: Remove Files, needs rethinking