erase useless variables
Merge branch 'hotfix-1287'