Remove upper bounds and close #158