More cleanup for camera-ready