Restored delete, update after merge