#18 remove the comments