cleanup: removed old stuff