remove unused method and a small tweak
Merge branch 'release/1.0.1'