Remove S suffixes