Remove unnecessary suffix