Remove cruft and use new studio bonjour codes