Finish removal of VP See merge request !693 (cherry picked from commit 8c812856) 172a719c Finish removal of VP