[Moose-dev] cleaning entity state