Clean security (14/15)

Clean security