Follow kibit cleanup advice