Some last cairo cleanup