simplify KORE classes
fix