[VP]  clean up