clean up
rebased kenova file