cleanup2017-7