Removed unused bundles and fixed existing configs