Clean up question -> answer mapping