Remove unused field
Merge branch 'master' into beta