Cleaning code for D.o