Fix alternative hyphen patterns and remove useless code