Cleaner security (6/18)

Cleaner security