Some cleanup for v0.115