add vp clean and move code