Merge "Remove legacy PV stuff"