Removed debug messages
Better cleanup of old trace buffers