Remove upper bounds and close #384