Fixed pylint complaints and removed one line of now-unused code.

Leo build: 20141020071537