Cleanup issues resulting in switch to 0.1 snapshot.