[TASK] Clean up data submission handling