Remove unused util class from the patches era