Controller Security Cleanup