Revert "Improve Order Book tracking"

This reverts commit 41347456b13ac1fbcd9d2258dc167d50eb9b9e32.