remove legacy code snippet
fix issue #16
fix issue #17