Removed bundles and cleaned up config