Fixed deletion implementation