Only strip if necessary