remove duplicate
add some tracing