Fixing bad commons-mail dependency
Cleaning up logging