[#58424260] more data cleanup