removed unused local variables (data collectors refactoring)