Simplified security management and testing.
Minor cleanup.