r7231: remove some old stuff