Merge "Remove stale targets from CI"