Deprecate "calculate scores" button, prepare to merge with master