fix: make types strict to prevent accidental deletion via unused type…

fix: make types strict to prevent accidental deletion via unused type… #2783