[DF-566] cleanup