Removed references to old EnumerableUtils methods and replaced with Linq methods