Removed some unused vars
Merge remote-tracking branch 'origin'