Remove some (possibly, to be verified) useless patches