Revert "Grid Unit Tracker"

This reverts commit d5c7df6967d14f438c1f9dd08b0abf7f17acc5d7.