More data cleanup logic