refactor(optimizer): clean up dead code for optimizer v2 (#12973)

refactor(optimizer): clean up dead code for optimizer v2 (#12973) #3848