Removed TODO & CONFIG; Removed references to a league parameter as it's no longer needed