Remove some unnecessary suffixes