Fixed misc grammar issues and removed deprecated code.
Merge remote-tracking branch 'origin/master'