on the S6 edge plus, I went to
settings>lock screen and security>Other security settings>clear credentials
and it let me now choose "none" on the lock screen and security>screen lock type> none
interested if anyone thinks this might be bad, but it is working for me so far.
hope this helps...