Remove some useless code.
Merge pull request #8 from rjuju/clean_code

Remove some useless code.