Revert "Match simulation algorithm"

This reverts commit 645219ceec99ac9845f61b4d48816bbfada25acd.
Reverted, @kunagpal refer work on Express for now