Delete method support. General code improvements.