Pull request for Issue665

@dretrex 
@davidChevrier 
Code cleanup.  Removing commented out code.