More SDME cleanup