Remove upper bounds and close #231
Upper bounds for #286