Mantis issue #2344 - clean up code.

Hits in first bin were being lost.  Removed unused features from
algorithm.