Removing excess folders