Remove obsolete
Tidy
Use SecurityModelConfiguration