Cleanup: remove debug logging and unused code.