Tidy; remove commented code.