Clean security (12/15)

Clean security