Final cleanup: remove dead code