Remove upper bounds and close #157