Another pass at ripping out SMS, this is great