Fix: TLS: Remove references to long since deprecated types