CLEANUP: remove dead code