code clean up for Security.h.