Merge branch 'ot/ref-filter-cleanup'

Code cleanup. * ot/ref-filter-cleanup: ref-filter: get rid of goto ref-filter: get rid of duplicate code