Improved the implementation and removed deprecated code.

git-svn-id: https://plugins.svn.wordpress.org/scrapebreaker/trunk@876176 b8457f37-d9ea-0310-8a92-e5e31aec5664