Fix barcode version mess up issue.
Revert waitcount.
Disable barcode version display since it got messup.