Remove ActionHeader to make action structures flat