Removing dead code and some unused caching from BundleState
24 files changed