Remove upper bounds and close #171