remove some comments, cleanup