0.2.1

Cleanup