Clean security (5/15)

Clean security