Cleanup for 0.27 release