Code Cleanup

Cleaned up some erroneous code and commented out examples.