Simplify suffix removal