Utils: improve the removeFQDNSuffix function