More work on data clearing