0.2.2

Cleanup