remove some comments and such