GNR-7 cleanup