Cleanup work on creation
0.0.2