Revert "Added Critical Path Optimization"

This reverts commit fb525a2f180dd8aaff2b6ee7a2b923deb41add29.