remove comments, work on #7