FIX: cleanup trace