Progress on delete impl.