Refs #3254 - Address all comments (lots of typos and useless code)