HomeHEPForge

cleanup CmpState logic