remove some bundles and remap keys