Remove upper bounds and close #355