Remove bundles repeat and surround