cleanup and add new cbs for esilvm