Update P and BR stripping code to play nicer