additional data cleanup and remove unused items