Cleanup for v0.1