SEC-2506: Remove Bundlor Support