[ANALYZER-1520] Fixing issue with reusing elements, removed some commented code