Latest method to unroot?

Does anyone know what's the latest and simplest method to unroot the device so OTA updates can be downloaded? If odining back to stock firmware can be avoided that'd be great. I'm trying to get rid of some annoying issues on my current build. Thanks.

Sent from my SAMSUNG-SM-G925A using XDA Free mobile app