more data folder cleanup