Remove this from AddWeb 6 completely.