STREAMS-191 | Removed commented out code that was in for refactoring purposes.