Remove upper bounds and close #286
Remove some patches