More cleanup and generation rate clamp