More add feature cleanup.