Fix some comments and white space; remove some dead code