Removing evaluate calls