[NFC] code cleanup