Fixed log messages.
Removed commented code.