Removed:
- Commented out code.  General clean up for the issue.