core: Function doesn't require CFG anymore to save time and memory