Removed last vestiges of State struct in the CPU