Removed multiple includes of some bundles