GNR-16 cleanup