#207. Removing commented code before pull request