Nice cleanup. I noticed the search API returns a bunch of very useless results.