fix concatenation, remove commented out code