Cleanup for v3.1.0.0