remove unused vars
Merge pull request #844 from aidev/master

remove unused vars