Remove some debugging code and generally clean things up.
Remove some debugging code and generally clean things up.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars