Cleaned up the code.  Refs #7789.

1. Optimized the logging;
2. Cleaned out some unused code;
3. Modified a method's argument.