removing unused variables and commenting
removing unused classes
Merge remote-tracking branch 'origin/master'