Fix issue #166
remove unused code
Merge branch 'yleo77-master'