final clean up for 0.6.1 release