Doc + remove old stuff