Remove messy stacktraces, put CV back in threads