Properly clear junk from trace FIFO; comment out count stuff in VHDL