Re #990 Code cleaning.
Re #329 Removing unnecessary log entries.