Removed unused definition
Generate kind checker and added pair and empty kind