SMS support - Remove static methods