Clean security (4/15)

Clean security