Clean up data: comment out fix code