Barcode unenroll changes

These changes were made during MIT Spark. There was some discussion about whether this is how we want it to work, so don't merge yet.