Remove some tracing, fix string compares.