Cleaner security (4/18)

Cleaner security