Remove xfa_test for delivery