Remove upper bounds and close #215