Remove status and add kind to orders-done