Remove upper bounds and close #310