Clean up, drop VNP dep