Major cleanup of round infrastructure