Pkg2: Remove state from fixup

As discussed @StefanKarpinski