Removed all references to wchar