Remove unused bundles and add incsearch