Reverted what I thought was some safe cleaning up. (Shouldn't have read some of my old comments!)