Cleaning up JCPP use