Remove unnecessary string manipulation