cleanup suffix logic