Remoev some headers from the state machine