clean up and check point before moving to v0.2