Cleaning up jc