Add support for cleaning up the data directory