REFS #98 #99 #100 - Removed unused variables
Merge pull request #131 from backbee/99

[RFR] REFS #98 #99 #100 - Removed unused variables