Remove repeated delete logic