re #444 : Code cleanup. Add delete support.