Remove commented lines, rationalise symbols