v0.22 code clean up, native update