Optimize out ScoreClause update