cleanup ControlFlowManager: remove printStackTrace, fix potential NPEs, comment out unused methods