D clean (21/22)

D clean