Minor NRF cleanup.