Removed some bundles and changed some configuration parameters