Merge pull request #35 from lararennie/label_fixes

Bug-fix in address verifier, plus removal of unused code