Removed more where-related stuff