remove unused and slight rearrangement