Merge branch 'release/0.6.0' into develop
Remove unnecessary codes
Merge branch 'release/0.6.0-1'