Remove the robust and recoverable NRP stuff.