CLEANUP: remove some dead code