removed TODOs from scorer