More cleaning before sending to detectl...