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