v0.1.6: cleanup