Clean security (10/15)

Clean security