cleaned up c9 stuffs