more DRC cleanup