Moved win_folder trim to where windows are being read in.