Changes for SMS in v2.1

If this is not necessary, kill it before it lays eggs.