Cleaner security (8/18)

Cleaner security