last minute cleanup for v1.9.0