Cleanup of old bundles and adding ctrl-p