group-official: Clean some debug stuff.
baofficial: Clean up. Fix a gpg/user bug.