WIP: Some cleanup for 0.2 release