Unregister primary bundles automatically
Avoid context conflict in accounts