Remove unnecessary variables
Merge pull request #23 from ChoiZ/dev

Remove unnecessary variables