(GH-iac-334) Remove code specific to unsupported OSs