Remove legacy smack support, keep upstream smack support