0.6 clean up
update 0.6