R4R: Fixes Upgrades

Remove the state directory (dead code).