More detritus cleanup