Removing a few redundant data structures.