Added option to remove MH/S affix.