cleanup2017-9