Upgrade to Harp 0.92
Cleanup