Remove excess folders