Remove a few unnecessary string operations