Removed additional surplus suffixes.