erase useless array
Merge branch 'hotfix-1518'