Moved soft delete changes out of core