Clean security (8/15)

Clean security