Cleaning up after Scaffold 2
Picking up a search engine for proper version.