removed lots of traces