Cleanup & update for Harp v0.9.4