Comment out barcode stuff for now