ENYO-1836: remove kind entries