monster and scu: cleanup of cfi instantiation