Remove duplication

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Remove traces

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>