Cleanup remaining debug strings and mate names