cleanup changes

[ci skip]