NFR clean-up.