Removed old Vending stuff, added more Dfe features, instances instead of static function