Really last of ceg warning cleanup