removed a couple of bundles and some small changes