Convert to new delete logic