Cleanup. No functionality change.