clean up for 0.8 release