[VP] #1 clean up