fix all/any
cleanup