Cleanup (part)
Cleanup adding rounds