PIM-1489 : Clean some code for state property