Work on basic delete API support. Eorly work on charset/UTF support. Some code cleanup.