Cleanup: removing old test file, cleaning up var names, and removing some old urllib usage.