cleanup where statements