Remove innecesary logging and check legality to resolve some kind of SAN disambiguations