some clean up
change version testing code to search, not reflection