Some comment fixes and dead code removal.