Smaller code cleaning.
KitKat: handling changed SMS issue.