+ core: cleanup the simple trace implementation