Improved delete method