Kill a bit more dead code and composite directory deletion.