cleanup rearrange