Adding support for delete and moved clean => clear