start cleanup #339 [skip ci]