[MAT-387] Get rid of remaining pOG...