Values for component properties not actually being deleted

You have everything right. The only other step would be the step I mentioned in GUI state 4 where I re-add 4 values and, when I PIE, the old values (from GUI State 2) are still present rather than the new values (from GUI State 4).