[ANALYZER-1520] Fixing issue with reusing elements, removed some commented code
Merge pull request #3 from pentaho-nbaker/master

[ANALYZER-1520] Fixing issue with reusing elements