Can't remove swipe to turn on screen

[AC Question]

I have the Samsung Galaxy S6. I set my Screen Lock type to Swipe a few months ago. I've decided I don't like it and want to disable it and use the power button to activate the screen. No matter how many times I change the Screen Lock Type to None, it always reverts back to the Swipe...even though the setting indicates None. I've read others are having the same problem and followed their solutions but I don't have the same options (they referred to Secure Lock Settings under Lock Screen and Security tab). Are there any other solutions out there? I'm constantly turning my phone on by accident just because something has passed in front of the screen.