remove useless code
Merge branch 'release/v0.8.2'