Prepare Kore for separation.
Remove unused field.
Refactor for clarity.
Merge branch 'feature/finalize_kore' into develop