Updated the way we deal with deletion