reflect changes in nrepl
cleanup some keys
simplify yank in insert state