Removed make_varchar and make_nvarchar methods, cleanup