Cleanup: removed dead code