Corrected some comments and remove some old ones