Clean up nps functions