fix log message
remove dead code
Merge pull request #1476 from logart/master

small fixes