Removing all uses of six.