Merge "Remove deleted fields/functions from greylist."