cleanup2017-3