Removed use of Linq