Mostly comment updates and remove some redundant code.