Comment changes, removing dead code.