Release version 0.2.1

* More error-prone cleanup after migration