Removed remaining usages of old VDF parser