[VP] clean up