Add JCS cleanup