Remove upper bounds and close #326