Remove some patch that might not be needed