Clean security (6/15)

Clean security