Cleanup to match actual submission