Cleaning up bundles.

A lot of these aren't used on this system.