Minor fixes, removing old bundles.