Clean up some redirect &amp; substrings