Clean chargen_probe

Hi @mcantoni,

This pull request tries to clean https://github.com/rapid7/metasploit-framework/pull/2681.  Please feel free to check/ review/ test /discuss anything, and once you feel comfortable with the changes land into your repo and the original https://github.com/rapid7/metasploit-framework/pull/2681 will be automatically updated!

thanks!