Reverted what I thought was some 'safe' cleaning up.