remove obsolete options; improve logging
update to match the actual code
Merge pull request #330 from sam-s/master

minor clean up