Made some adjustments and prep for better remove_urls