impove native
cleanup