Minor, remove unused variables
Merge remote-tracking branch 'origin/dev-minor'