Remove commented out code and excessive whitespace.
Merge pull request #6 from cablelabs/cbl_blong/remove-dead-code-and-excessive-whitespace

Remove commented out code and excessive whitespace.