Last of ceg warning cleanup