Ok. So I was able to get back to swipe to unlock. I disabled smart lock under trust agents, then cleared credentials. This allowed the option of using either none or swipe under screen lock (no longer grayed out). Although my phone may not be as secure I feel better knowing I have control how my phone is set up.