Cleanup: Remove dead code