Removed unneded .Where() calls