Cleaned up JNP2.