remove last few references to JCs