fixup! Update to ARC

My bad. :( There was actually no reason remove the static storage (and therefore redo the validation very time it's called).