remove commented out functions.

Also remove unused function
pep8