remove dead code and minus enhance
Merge pull request #95 from Yahasana/master

remove dead code and minus enhance