Cleanup

--> v0.2.1