D clean (18/22)

D clean