Remove clumsy addition of functions for TLS