Simplify and correct 4 TLS discovery actions