Remove some dead code
Remove a few unnecessary .c_str() calls