2017-10-WIL-cleanup18