Remove some commented out code.
Clean up some style issues outlined by pylint.
Remove some commented out code.