Remove use of thread-local input