Cleanup: removed dead code.