Remove upper bounds and close #342