Finish: remove some comments