Fix output; remove commented out code.