Clean security (7/15)

Clean security