Merge pull request #57 from leftclickben/master

Remove unnecessary variables.
Merge pull request #58 from leftclickben/master

Remove unused dependency