Remove hardcode of round