Fixed deletion issues