Further clean-up HandFinderHandler