Cleanup while publishing 0.6.1