LPS-49088 Remove unused field
LPS-49088 Regenerate
LPS-49297 Preventing the use of an iterator that can be invalidated inside the loop