OTHER: Remove unnecessary string manipulation