Remove use of Linq expressions