Remove vpx and vpy, they were never used.