Refactor "cis_removed_pkgs" to allow exceptions