Remove Dict2D from the code base

I'm working on removing Dict2D from the code base and will be using this to run the test suite as there's some core functionality that depends on a few of these functions.