Clean useless code
Merge pull request #2 from jubianchi/clean

Remove useless code, thanks to @jubianchi for the code review.