[minor] Cleanup before PR.