Fix: Security Settings - None Crash

and other clean up :)

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>