[X-update] clean up