Cleanup for v0.8.5