Removed the hard coded extras and total scores