Merge branch 'release/1.8.1' into develop
Remove unnecessary codes
Merge branch 'develop'