minor
code gardening
don't sort after Collections.binarySearch
use :value bundle pub/sub convention
unused code removed