20131218 move code in package search2 to search, and remove unused code.