Merge pull request #31 from is-valid/624_N

624 n
Merge branch 'dev' into 624_N
Remove unnecessary variables