Remove bundles once again -_-