CFY-999 Some cleanups and now using is_neutron_supported_region