Added the letter s to a comment.
Removed 4 lines of useless code.
Merge pull request #2884 from sam-at-github/controller-tidy

Controller tidy