remove grid_matcher (no longer required)
update TODOs