Clean up cup data, add roster data.