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

This resolves #98 , #99 & #100 issues by removing unused variables.

PR is up to date from master branch