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

Remove unnecessary code
Merge pull request #21 from axsh/remove-unnecessary-code

Remove unnecessary code
remove no longer unused params.
remove unnecessary "&&".
remove no longer unused checkroot().