removing dead code lines and excess comments

Updating for pull request on composer/composer repository.