fixup build after 'remove unused functions + fix comments'