removed most traces, but not all