PLD: sms support cleanup