[XSP] Clean up SecurityConfiguration, use modern features