c9 cleanup