cleaning up old nrn code