Remove more of the broken scores system