Some cleanup for 2.0.40