More code cleanup [NFC]