Clean Trace & Data components
New Net components