Removed VRP madness