Refactoring so BoundedMap is not needed
2 files changed