Clean security (3/15)

Clean security