Remove some dead codes
Merge pull request #41 from shadowglen/master

Remove some dead codes