delete some comments and do a little clean up