Add some comments, remove some code.