Remove upper bounds and close #350