Remove the list of source sets, since we only use the first one
Fix the algo I just broke