Cleaned up the security approach