Merge pull request #29 from axsh/remove-unnecessary-code

Remove unnecessary code
remove unused code.