code cleanup PHASE ONE DOE