cleanup comments ...