Remove upper bounds and close #224