Complete func transition, cleanup, update readme