HunterGathererMDPState cleanup
code cleanup