Cleanup: removed unused code.