cleanup: removed old stuff (bis)