remove redundant code after verifying convergence flow #3097
Description
can be done, I'm keeping the changes to the minimum until we test the whole flow atleast once and then start cleaning up.
Originally posted by @leelavg in #3096 (comment)