cleanup KCL
add Factory extension capability for JCLHandler (TODO add in API)