add xiki note, cleanup