Fixes #8 in version 0.1.6
Remove unused codes