Clean up some ceg stuffs