Review our internal data structures. Cleanup