more ibm1, ibm2 cleanup